Upgrade rust-installer

diff --git a/Makefile.in b/Makefile.in
index c176ee0f48f65cfd5bac65cf684e924d6d38bc84..cdf14e4d2824b724bf9321868a74e7f0572bbb72 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,6 +60,7 @@ TARGET_$(1) = $$(TARGET_ROOT)/$(1)
 endif
 DISTDIR_$(1) = $$(TARGET_$(1))/dist
 IMGDIR_$(1) = $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1)-image
+OVERLAYDIR_$(1) = $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1)-overlay
 PKGDIR_$(1) = $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1)
 BIN_TARGETS_$(1) := $$(BIN_TARGETS:%=$$(TARGET_$(1))/%$$(X))
 endef
@@ -137,8 +138,6 @@ $(DOC_DIR)/%: src/doc/%
 
 # === Distribution
 
-NON_INSTALLED_PREFIXES := README.md,LICENSE-MIT,LICENSE-APACHE,LICENSE-THIRD-PARTY
-
 define DO_DIST_TARGET
 dist-$(1): $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz
 
@@ -173,19 +172,23 @@ prepare-image-$(1):
        cp src/etc/cargo.bashcomp.sh $$(IMGDIR_$(1))/etc/bash_completion.d/cargo
        cp README.md LICENSE-MIT LICENSE-APACHE LICENSE-THIRD-PARTY \
                $$(IMGDIR_$(1))/share/doc/cargo
+
+prepare-overlay-$(1):
+       rm -Rf $$(OVERLAYDIR_$(1))
+       mkdir -p $$(OVERLAYDIR_$(1))
        cp README.md LICENSE-MIT LICENSE-APACHE LICENSE-THIRD-PARTY \
-               $$(IMGDIR_$(1))
+               $$(OVERLAYDIR_$(1))
+       echo "$(CFG_VERSION)" > $$(OVERLAYDIR_$(1))/version
 
-$$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz: prepare-image-$(1)
+$$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz: prepare-image-$(1) prepare-overlay-$(1)
        sh src/rust-installer/gen-installer.sh \
-               --product-name=Cargo \
-               --verify-bin=cargo \
+               --product-name=Rust \
                --rel-manifest-dir=rustlib \
-               --success-message=Cargo-is-ready-to-roll. \
+               --success-message=Rust-is-ready-to-roll. \
                --image-dir=$$(IMGDIR_$(1)) \
                --work-dir=./$$(DISTDIR_$(1)) \
                --output-dir=./$$(DISTDIR_$(1)) \
-               --non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
+               --non-installed-overlay=$$(OVERLAYDIR_$(1)) \
                --package-name=$$(PKG_NAME)-$(1) \
                --component-name=cargo \
                --legacy-manifest-dirs=rustlib,cargo

diff --git a/src/rust-installer b/src/rust-installer
index b5ac4cd44321da10dfd70f070dbc9094ca3f92ff..60fd8abfcae50629a3fc664bd809238fed039617 160000 (submodule)
--- a/src/rust-installer
+++ b/src/rust-installer
@@ -1 +1 @@
-Subproject commit b5ac4cd44321da10dfd70f070dbc9094ca3f92ff
+Subproject commit 60fd8abfcae50629a3fc664bd809238fed039617